From Mark Bradley. Use compare instead of explicit diff.

diff --git a/gpsbabel/testo b/gpsbabel/testo
index a3b52551f2c2a00b0f88df241dccc524d8f68602..52052c27537410963890cc58f1a4d64c1b1c62a8 100755 (executable)
--- a/gpsbabel/testo
+++ b/gpsbabel/testo
@@ -483,10 +483,11 @@ ${PNAME} -r -i gpx -f reference/route/route.gpx \
 # Verify the first and last are the same
 compare ${TMPDIR}/reference.arc  ${TMPDIR}/reverse2.arc
 # Verify the first and second are different.
-${DIFF}  ${TMPDIR}/reverse1.arc  ${TMPDIR}/reverse2.arc > /dev/null && {
-               echo ERROR Failed reversal test.
-               exit 1
-}
+#${DIFF}  ${TMPDIR}/reverse1.arc  ${TMPDIR}/reverse2.arc > /dev/null && {
+#              echo ERROR Failed reversal test.
+#              exit 1
+#}
+compare  ${TMPDIR}/reverse1.arc  ${TMPDIR}/reverse2.arc
 
 #
 # Geoniche: No reference file was available, so we created one and just
@@ -496,7 +497,7 @@ rm -f ${TMPDIR}/gn.pdb ${TMPDIR}/1.gpx ${TMPDIR}/2.gpx
 ${PNAME} -i geoniche -f reference/geoniche.pdb -o geoniche -F ${TMPDIR}/gn.pdb
 ${PNAME} -i geoniche -f reference/geoniche.pdb -o gpx -F ${TMPDIR}/1.gpx
 ${PNAME} -i geoniche -f ${TMPDIR}/gn.pdb -o gpx -F ${TMPDIR}/2.gpx
-${DIFF} ${TMPDIR}/1.gpx ${TMPDIR}/2.gpx
+compare ${TMPDIR}/1.gpx ${TMPDIR}/2.gpx
 
 #
 # saroute covers *.anr, *.rte, and *.rtd, but I only have an .anr for testing.
@@ -504,7 +505,7 @@ ${DIFF} ${TMPDIR}/1.gpx ${TMPDIR}/2.gpx
 #
 ${PNAME} -t -i saroute -f reference/track/i65.anr -o gpx -F ${TMPDIR}/gpl1.gpx
 ${PNAME} -t -i gpx -f reference/track/i65.anr.gpx -o gpx -F ${TMPDIR}/gpl2.gpx
-${DIFF} ${TMPDIR}/gpl1.gpx ${TMPDIR}/gpl2.gpx
+compare ${TMPDIR}/gpl1.gpx ${TMPDIR}/gpl2.gpx
 
 #
 # Delorme GPL file.   This is sort of a track format.
@@ -513,7 +514,7 @@ rm -f ${TMPDIR}/gpl1.gpx ${TMPDIR}/gpl2.gpx ${TMPDIR}/gpl1.gpl
 ${PNAME} -t -i gpl -f reference/track/webpark1.gpl -o gpx -F ${TMPDIR}/gpl1.gpx
 ${PNAME} -t -i gpl -f reference/track/webpark1.gpl -o gpl -F ${TMPDIR}/gpl1.gpl
 ${PNAME} -t -i gpl -f ${TMPDIR}/gpl1.gpl -o gpx -F ${TMPDIR}/gpl2.gpx
-${DIFF} ${TMPDIR}/gpl1.gpx ${TMPDIR}/gpl2.gpx
+compare ${TMPDIR}/gpl1.gpx ${TMPDIR}/gpl2.gpx
 
 #
 # NetStumbler Summary File (read-only)